Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: fix nfs version option during mounts #9559

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

shwstppr
Copy link
Contributor

Description

Fixes #9469

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Copy link

codecov bot commented Aug 21, 2024

Codecov Report

Attention: Patch coverage is 0% with 30 lines in your changes missing coverage. Please review.

Project coverage is 15.08%. Comparing base (b4325ec) to head (3445407).
Report is 35 commits behind head on 4.19.

Files with missing lines Patch % Lines
...om/cloud/upgrade/SystemVmTemplateRegistration.java 0.00% 24 Missing ⚠️
...ain/java/com/cloud/storage/StorageManagerImpl.java 0.00% 4 Missing ⚠️
...cloudstack/diagnostics/DiagnosticsServiceImpl.java 0.00% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.19    #9559      +/-   ##
============================================
- Coverage     15.08%   15.08%   -0.01%     
- Complexity    11185    11187       +2     
============================================
  Files          5406     5406              
  Lines        473123   473143      +20     
  Branches      61313    60436     -877     
============================================
- Hits          71378    71374       -4     
- Misses       393805   393828      +23     
- Partials       7940     7941       +1     
Flag Coverage Δ
uitests 4.30% <ø> (ø)
unittests 15.80% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shwstppr shwstppr linked an issue Aug 22, 2024 that may be closed by this pull request
@weizhouapache
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10743

@shwstppr shwstppr changed the title server: fix nfs version option during mount server: fix nfs version option during mounts Aug 23, 2024
@shwstppr
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10867

@shwstppr
Copy link
Contributor Author

shwstppr commented Sep 3, 2024

@blueorangutan package

@blueorangutan
Copy link

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10926

@shwstppr
Copy link
Contributor Author

shwstppr commented Sep 3, 2024

@blueorangutan test

@blueorangutan
Copy link

@shwstppr a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-11312)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 47686 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9559-t11312-kvm-ol8.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_secure_vm_migration Error 134.49 test_vm_life_cycle.py
test_01_secure_vm_migration Error 134.49 test_vm_life_cycle.py

@shwstppr shwstppr marked this pull request as ready for review September 4, 2024 05:57
@rohityadavcloud rohityadavcloud added this to the 4.19.2.0 milestone Sep 4, 2024
Copy link
Collaborator

@abh1sar abh1sar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Didn't test.

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

@DaanHoogland
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11029

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-11401)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 47750 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9559-t11401-kvm-ol8.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_03_secured_to_nonsecured_vm_migration Error 393.96 test_vm_life_cycle.py

@DaanHoogland
Copy link
Contributor

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@JoaoJandre
Copy link
Contributor

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

@DaanHoogland
Copy link
Contributor

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

trying to fit it in @JoaoJandre ;)

Comment on lines +149 to +156
public static String getMountCommand(String nfsVersion, String device, String dir) {
String cmd = "sudo mount -t nfs";
if (StringUtils.isNotBlank(nfsVersion)) {
cmd = String.format("%s -o vers=%s", cmd, nfsVersion);
}
return String.format("%s %s %s", cmd, device, dir);
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks like a good generic method for creating the mount command, but it is in SystemVmTemplateRegistration. Does it make sense to move it to a utility and search for other places to use this, @shwstppr ? (some deduplication may be resulting)

@DaanHoogland
Copy link
Contributor

@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur?

@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20

trying to fit it in @JoaoJandre ;)

This got a bit behind in priority, need to create an env that doesn't support nfsv3 to do a functional test.

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Sep 25, 2024

Tested according to the initial issue:

  • registering a template as system vm works and
  • retrieving diagnostics data as well!

@DaanHoogland DaanHoogland merged commit 53aa921 into apache:4.19 Sep 25, 2024
25 of 26 checks passed
@DaanHoogland DaanHoogland deleted the fix-nfsversion-ops branch September 25, 2024 14:47
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

secstorage.nfs.version is not used in two scenarios
8 participants